merge trunk
authorK. Handa <handa@gnu.org>
Sun, 10 Mar 2013 14:30:19 +0000 (23:30 +0900)
committerK. Handa <handa@gnu.org>
Sun, 10 Mar 2013 14:30:19 +0000 (23:30 +0900)

Trivial merge